From: Jan Vesely <jan.vesely@rutgers.edu>
Date: Thu, 6 Dec 2018 21:57:23 +0000 (-0500)
Subject: gitlab-ci: Add builds without liblcms2
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~12^2~9^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1216691c34ed06ab0f3ece42cc029850147f9792;p=babl.git

gitlab-ci: Add builds without liblcms2

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 377010f..f4f3a84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@
     - _build/*/*.log
     - _build/*/*/*.log
 
-.meson-build-lcms: &meson-build-lcms
+.meson-build: &meson-build
   - meson _build
       -D enable-f16c=true
       -D enable-mmx=true
@@ -19,10 +19,11 @@
       -D enable-sse3=true
       -D enable-sse4_1=true
       -D with-docs=true
+      ${LCMS_OPTION}
   - ninja -C _build
   - ninja -C _build test
 
-.autotools-build-lcms: &autotools-build-lcms
+.autotools-build: &autotools-build
   - mkdir _build
   - cd _build
   - ../autogen.sh
@@ -33,7 +34,7 @@
       --enable-sse2
       --enable-sse3
       --enable-sse4_1
-      --with-lcms
+      ${LCMS_OPTION}
   - make
   - make check
 
@@ -41,21 +42,51 @@ latest-meson-lcms:
   stage: build
   image: base/archlinux:latest
   artifacts: *artifacts-meson
+  variables:
+    LCMS_OPTION : "-Dwith-lcms=true"
   before_script:
     - pacman -Syu --noconfirm --needed
         base-devel
         meson
         lcms2
         git
-  script: *meson-build-lcms
+  script: *meson-build
+
+latest-meson-nolcms:
+  stage: build
+  image: base/archlinux:latest
+  artifacts: *artifacts-meson
+  variables:
+    LCMS_OPTION : "-Dwith-lcms=false"
+  before_script:
+    - pacman -Syu --noconfirm --needed
+        base-devel
+        meson
+        lcms2
+        git
+  script: *meson-build
 
 latest-autotools-lcms:
   stage: build
   image: base/archlinux:latest
   artifacts: *artifacts-autotools
+  variables:
+    LCMS_OPTION : "--with-lcms"
   before_script:
     - pacman -Syu --noconfirm --needed
         base-devel
         lcms2
         git
-  script: *autotools-build-lcms
+  script: *autotools-build
+
+latest-autotools-nolcms:
+  stage: build
+  image: base/archlinux:latest
+  artifacts: *artifacts-autotools
+  variables:
+    LCMS_OPTION : "--without-lcms"
+  before_script:
+    - pacman -Syu --noconfirm --needed
+        base-devel
+        git
+  script: *autotools-build